Revert 233ee55..341d5a6

This rolls back to commit 233ee550f751b47859509a8fb05e26ba7ad2dd2a.