Revert f2cc751..997b2bb

This rolls back to commit f2cc7510312944697c2458bdfb73a074d49887bf.