Revert 88f2071..199377a

This rolls back to commit 88f2071ae32bd3e8b840c8233fc283e0f920c331.