Revert 40a6fb5..d239275

This rolls back to commit 40a6fb51d008d982c73ea0fa16e9f231eb73b5d0.