Revert 46679f6..6a79ab4

This rolls back to commit 46679f6197e9adb9e3454904040da231abeb2c85.