Revert fbb05a2..b94c540

This rolls back to commit fbb05a2de6e396338ffd576c85f8c676e8170855.