Revert 5f0a994..b622ffe

This rolls back to commit 5f0a994377db163b1d43e64062242613d06250cb.