Revert cd7d608..15557fb

This rolls back to commit cd7d608b742da2f694633beaa599a47f3c4a72c1.
newest version