Revert 72e3619..030cb68

This rolls back to commit 72e3619c0df7efcf61e369e37865dc1c327c9f43.