Stop using workarounds

by Igor Izhik