Revert b92156d..da5becf

This rolls back to commit b92156d0020842a4a737c5677e1d48f54524c9b3.