Revert 8519321..0963cc1

This rolls back to commit 85193218af258eaa1a57753cbd5bf3edbdf5357a.