Revert 09524b6..eb4ed74

This rolls back to commit 09524b6897c23836cee4cf81a41abb2eec5a9163.
Commit fix.