Revert be53335..0d02c4d

This rolls back to commit be5333572e02c5dff5ac8cfe8acb399ec7d2f083.