Revert 65564e1..36a7477

This rolls back to commit 65564e1d1a98a466483f1fb327c9a4fa82c3900b.