Revert 251386a..fab0feb

This rolls back to commit 251386a1c4c5d3a9bfd91b34682e1f6c012d4035.