Revert 2c69de0..c312bc2

This rolls back to commit 2c69de033856f632ea25d039d61697446ff39766.