Revert 0e45fc0..b62577b

This rolls back to commit 0e45fc0dab6a1a40b508364be23f7f02e94b0ce1.