Revert fb99dff..5cabc0a

This rolls back to commit fb99dff274e63a9fb6de8117a4c74da07a423d51.