Revert 9e92779..e45f85d

This rolls back to commit 9e92779a0275ef0c114536755f1fb403ea92c4d6.