Revert bdadcbe..5a872d5

This rolls back to commit bdadcbe431b87c1df7f5401a2fbf9417099e2e64.