Revert a92343f..db64023

This rolls back to commit a92343fea9dd130b0e68dc5061e202961c16cd1c.