Revert b38c790..f002a3c

This rolls back to commit b38c790a3036fc09f648e73b4ec6584839a52fd0.