Revert a1fa7ed..15b2d68

This rolls back to commit a1fa7ed3deeb57ab24ab5349f7cf6072b60d05c3.
..