Revert 05df8e9..04c43d0

This rolls back to commit 05df8e90482a4fc560c31f218238d02d673dc6b4.