Revert 70aa25d..686e21f

This rolls back to commit 70aa25ddc047df5194264a3423a4235cba201061.