Revert 49f82d8..47dc50e

This rolls back to commit 49f82d8982ad6437218c5ac5dd04913e6ffae48a.