Revert 53d0748..d49ca01

This rolls back to commit 53d074857634270445a4ca43d6a34708827fe795.