Revert 44cdac3..a7430a4

This rolls back to commit 44cdac3f0bfcdf42b04fe491719fac9a06c6d34e.