Revert 46936b9..5bcc8f2

This rolls back to commit 46936b98a3a14707b715fc88cd9d6f475a0a29b2.