Revert 94d030f..179e331

This rolls back to commit 94d030f27643e9e976d7f8f4c021ed66ba79a457.