Revert f4f6e2f..62d46bb

This rolls back to commit f4f6e2f1fa54dc8f65482c46431637029f0ff2a7.