Revert f3577ac..04ddf12

This rolls back to commit f3577ac996b18fed27a0db5f3208310f68377d50.
Log. Saved from 2013.12.07