Revert 55fec5d..0b87725

This rolls back to commit 55fec5dcc44be3cceaece35a72f5f3e3b2ef1684.