Revert 2ae23b7..bdf2a4d

This rolls back to commit 2ae23b7b5649b0beafa30f6bca694a2e82745e4e.