Revert f82d1e0..428cad5

This rolls back to commit f82d1e04c5ce494cd16da9e05cf2259ad3919fb6.