Revert f52fd3f..565bd9f

This rolls back to commit f52fd3f2f05f6502e0f3d9ce233cc25a169c95e5.