Revert 012ca09..d06adf8

This rolls back to commit 012ca09145142c78247a554e608d9e4aefb3b1da.