Revert 986a5cc..e1420cd

This rolls back to commit 986a5ccdf6e8d202658609872bd3eaa20dbbfda1.