Revert 130225f..7faf6c9

This rolls back to commit 130225f41c728ee2fbbef34aafb18047d028d6eb.