Revert 4b288a2..cc746e1

This rolls back to commit 4b288a29d0eab99f6817fe215949a7e4a21975f3.