Revert eba1b1d..a2cb65a

This rolls back to commit eba1b1dba9b977592ae209e812d64f9c535d42a3.