Revert f7e3d20..1c290df

This rolls back to commit f7e3d20c0566b3ba709c4a50b017d9f98b5fb55c.