Revert 001d89a..b0b19d5

This rolls back to commit 001d89a2482d4096731b5ce6c08fef12603f6802.