Revert 5423b46..c91164a

This rolls back to commit 5423b463bae4b58c6970c242fd3268c896ddbcc4.