Revert 5eca3bc..0e25dbe

This rolls back to commit 5eca3bc7649f16cfb95c9705051ca18b3388b614.
roll back for merge