Revert 719e281..cb2dc9b

This rolls back to commit 719e28184032b8c84d8c233926c60cbdd22ba7a7.