Revert 46a61e5..24a4c46

This rolls back to commit 46a61e55652d2d1ab06fa0d485a5d28036f051fe.