Revert b4fc525..7e532b0

This rolls back to commit b4fc52574cc74e603d590ad3ea35271af6890bc9.