Revert 9900801..380bd6b

This rolls back to commit 9900801fd555bd470f28b9e1712348f67afccd64.