Revert f2dabf0..5c337ca

This rolls back to commit f2dabf0931ddfef21756da27efcdfa04b65d8be5.