Revert c6d9a1a..46d5364

This rolls back to commit c6d9a1aa7a637127a7d2ffdd32a38f0d26c8895a.