Revert 4700cd1..646e159

This rolls back to commit 4700cd1c178bccb1bc18acbd171371b0351c9fc7.