Revert 0131ba8..fbcbe3c

This rolls back to commit 0131ba8907f0d464056e67b583f4c2a08c69d6d8.