Revert a89c849..eb70243

This rolls back to commit a89c84979c220f54917b910cd7709318f7973681.