Revert 2f4fcb0..ad7bb1a

This rolls back to commit 2f4fcb08580f57de03c7a67d3e571526c16d83e3.