Revert 1cd44fd..fc5961a

This rolls back to commit 1cd44fdaa677062131978edb3ce14c87192d88b4.