Revert 3c7d4ef..605bea0

This rolls back to commit 3c7d4ef2feb2c0e32171717fcf4e312fdcb8dd86.