Revert 27dfe18..334115f

This rolls back to commit 27dfe18356fe43fd286586c759d9d030027e6924.