rsim/oracle-enhanced — pull request #387 by yahonda (2013-12-03 16:47:34+00:00)
Title: Revert #371

This reverts commit 9935366e090c4b1ed75310e232e2b06700484b5a.

See #371