Revert 6a2b8e3..3c6775e

This rolls back to commit 6a2b8e327fd7f9cddebb2a690601d1d6df42d1de.
Nothing important