Revert ba51b91..79052fc

This rolls back to commit ba51b915af7443b23057f9709a97d69b363b598d.