Revert 184d06a..8244ae4

This rolls back to commit 184d06ae4aea4520f0b39345620a6321d09446cc.