Revert 7d9f4f6..6f495ab

This rolls back to commit 7d9f4f6f2751af2b6724851fdff52a37c877ef29.