Reverted some code from 0.6.3 and fixed a unit test