Revert 33c8837..2a9388b

This rolls back to commit 33c8837ed8914dceb400aad2b78cc88de96101b2.