Revert bfb86c3..be53335

This rolls back to commit bfb86c36197258422da7f203c8abb261655f6c45.