Revert 3162ab3..fdc1b1d

This rolls back to commit 3162ab3863709dee2344416ea19a94b286efbe3b.