Revert 4f258ea..402acdd

This rolls back to commit 4f258eac1cac1ef472aa67124ff0ccca8a7aebbf.