Revert 1cb105e..72658d2

This rolls back to commit 1cb105e44920cd719a01813792fa707f422d4359.