Revert 3026bad..3e6503c

This rolls back to commit 3026bad579d0e613d67221d76bde515062d55691.