Revert 757a4b2..6e68150

This rolls back to commit 757a4b203aea6c32184a27fd0a5e78a08f9937cf.