Revert 73a41ac..47039cf

This rolls back to commit 73a41acd1288aa9d7332667b0437e4b48a23de34.