Revert 984aa59..44d1751

This rolls back to commit 984aa5942d093a3c6ad50ec7f01f3a31602bf70e.