Reverting #24