Revert 3dbed16..febbff6

This rolls back to commit 3dbed16c008ca5c0efa4320365b82bde1e9d6372.