Revert bbca4af..b4aae81

This rolls back to commit bbca4af26b6f3a5e4947fea607d952f1dabca1ed.