Revert 55b015b..0caa0bd

This rolls back to commit 55b015b2e0bcd62d0c5f1dc856074da598bb3422.