Revert 3da8b11..04aab3a

This rolls back to commit 3da8b115abbc46bd6283069a94a21c79c3466d54.