Revert 75a73a1..c5eb593

This rolls back to commit 75a73a16670b62d28005572b5a696d8db2cc0dee.