Revert 4255f3c..54bf46c

This rolls back to commit 4255f3c36a4f5938ad38582daadad59dba6a5c6a.
201309231051