Revert 00950ba..6bdb443

This rolls back to commit 00950ba86aa37f56be840a384b4c8601fe0a611e.