Revert 42fc359..1f0ec94

This rolls back to commit 42fc3592a52b331b7bd3a7771547dcf488ccfc2b.