Revert 1cf6266..5738d6c

This rolls back to commit 1cf626646f6d6ac8a42572c7ca338a0a82d44b20.