Revert bfcbf40..9731d4b

This rolls back to commit bfcbf4079f7652e5d13c7274c9f790e7a43a6f98.