Revert 727491b..4896c51

This rolls back to commit 727491be5f25ef8aaa172dca07ff5d1999f1100e.