Revert 68871d1..480e527

This rolls back to commit 68871d13826ec6afff77470a7893cccaf99ed615.