Revert 491dac5..f62540f

This rolls back to commit 491dac5340b1dd5783a638b38b45138861e5a420.