Revert 6ae692d..a4eef18

This rolls back to commit 6ae692da7550e7365fdbf65321603011a3a86434.