Revert 27a2aa1..37feeab

This rolls back to commit 27a2aa187ecd845255d9d21d208cc7ed3fdf85f1.