Revert 35edc51..09d02e0

This rolls back to commit 35edc5111df7e3c29c71a4757fb0dee2e297c341.