Revert bba5a8c..2a1a563

This rolls back to commit bba5a8c2f2ed1950f7f9fcb7647cb1336c0aa434.