Revert 99a64fa..49f14d6

This rolls back to commit 99a64fa9ae386a580d603b01c5a3e6372601ac02.