Revert c85124f..4419a6f

This rolls back to commit c85124f10b0510da2c2d46d9d81cfc1aae2734a1.