Revert 25fee83..125d7ce

This rolls back to commit 25fee83ddcb1f0aeb5567263f269f474e41108a2.