Revert 79f7fa7..52156ad

This rolls back to commit 79f7fa75a51c79599e788594d422cf341177f755.