Revert 0fa572b..5f36a41

This rolls back to commit 0fa572b80d75eafee7539089d2a5ce3c3e2be5e1.