Revert 45d1d15..82680c1

This rolls back to commit 45d1d15c255480259cc89e2cc85cbd624f902aa6.