Revert f0ae1b8..1396d06

This rolls back to commit f0ae1b8396c751ee3239597eaf91323bc19723af.