Revert 79d45be..2946acd

This rolls back to commit 79d45be29035332da2c39c21a37198e50c222b34.